Delete merge marker.
authorRomain Francoise <romain@orebokech.com>
Sun, 13 Jan 2013 21:26:10 +0000 (22:26 +0100)
committerRomain Francoise <romain@orebokech.com>
Sun, 13 Jan 2013 21:26:10 +0000 (22:26 +0100)
commit747d94052edb1f72eff978de44c9ffc663625c00
tree14cc010bdbcafa4a405a8bd6af2bb15a187d7316
parent53980ed5387a6c923928456efc55e73976979d94
Delete merge marker.
lisp/gnus/ChangeLog